Also bundle icons in status/ as resources
authorLars Uebernickel <lars.uebernickel@canonical.com>
Wed, 28 Jan 2015 14:13:42 +0000 (14:13 +0000)
committerLars Uebernickel <lars.uebernickel@canonical.com>
Wed, 28 Jan 2015 14:26:46 +0000 (14:26 +0000)
https://bugzilla.gnome.org/show_bug.cgi?id=743647

gtk/Makefile.am

index 2daf367432040aa6157653f8d186e14bbe2b6759..738ca8eda1c91fe47f7225b84f6f7b10d46fa028 100644 (file)
@@ -1155,10 +1155,13 @@ gtk.gresource.xml: Makefile.am
          n=`basename $$f`; \
          echo "    <file compressed='true'>ui/$$n</file>" >> $@; \
        done; \
-       for s in 16x16 22x22 24x24 32x32; do \
-         for f in $(srcdir)/icons/$$s/actions/*.png; do \
-           n=`basename $$f`; \
-           echo "    <file>icons/$$s/actions/$$n</file>" >> $@; \
+       shopt -s nullglob; \
+       for s in 16x16 22x22 24x24 32x32 48x48; do \
+         for c in actions status; do \
+           for f in $(srcdir)/icons/$$s/$$c/*.png; do \
+             n=`basename $$f`; \
+             echo "    <file>icons/$$s/$$c/$$n</file>" >> $@; \
+           done; \
          done; \
        done; \
        for f in $(srcdir)/inspector/*.ui; do \